core: fix crash when computed nested map given in module block #13343
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbardin
approved these changes
Apr 4, 2017
| @@ -114,7 +114,6 @@ type EvalVariableBlock struct { | |||
| VariableValues map[string]interface{} | |||
| } | |||
|
|
|||
| // TODO: test | |||
terraform/eval_variable.go
Outdated
| @@ -175,14 +174,22 @@ func (n *EvalVariableBlock) setUnknownVariableValueForPath(path string) error { | |||
| var current interface{} = n.VariableValues[pathComponents[0]] | |||
| for i := 1; i < len(pathComponents); i++ { | |||
| switch current.(type) { | |||
There was a problem hiding this comment.
We could define switch tCurrent := current.(type) { here, and get rid of the redundant assertions below.
There was a problem hiding this comment.
Oh yes, good point! I will update this before merging.
This crash resulted because the type switch checked for either of two types but the type assertion within it assumed only one of them. A straightforward (if inelegant) fix is to simply duplicate the relevant case block and change the type assertion, thus allowing the types to match up in all cases. This fixes #13297.
This previously lacked tests altogether. This new test verifies the "happy path", ensuring that both literal and computed values pass through correctly into the VariableValues map.
apparentlymart
force-pushed
the
b-gh13297-nested-map-crash
branch
from
acd225f to
df4c0a0
Compare
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This crash resulted because the type switch checked for either of two types but the type assertion within it assumed only one of them.
A straightforward (if inelegant) fix is to simply duplicate the relevant case block and change the type assertion, thus allowing the types to match up in all cases.
This fixes #13297.
(Also includes a basic test for this eval type, since it entirely lacked one before.)